bitkeeper revision 1.1709.1.6 (42af188067osLjX0T63Zb45JU4Zd2w)

Enable dom_mem_ops on XEN/IA64

Signed-off-by Kevin Tian <Kevin.tian@intel.com>

diff --git a/xen/arch/ia64/hypercall.c b/xen/arch/ia64/hypercall.c
index 64947ac59c948e4745b9df9c91e540316ed9fd22..5a80855c7c12a454e3af7416acee32cfed3b7373 100644 (file)
--- a/xen/arch/ia64/hypercall.c
+++ b/xen/arch/ia64/hypercall.c
@@ -126,8 +126,7 @@ ia64_hypercall (struct pt_regs *regs)
                break;
 
            case __HYPERVISOR_dom_mem_op:
-               /* regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); */
-               /* we don't handle reservations; just return success */
+               regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); 
                regs->r8 = regs->r16;
                break;
 

diff --git a/xen/common/Makefile b/xen/common/Makefile
index ee312fde921cca7813ee2c419c70d44830baa571..892d407585663b94fd064e89403c913ff34cf865 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -1,8 +1,8 @@
 
 include $(BASEDIR)/Rules.mk
 
-ifeq ($(TARGET_ARCH),ia64) 
-OBJS := $(subst dom_mem_ops.o,,$(OBJS))
+ifeq ($(TARGET_ARCH),ia64)
+#OBJS := $(subst dom_mem_ops.o,,$(OBJS))
 OBJS := $(subst grant_table.o,,$(OBJS))
 endif